Merge remote-tracking branch 'origin/staging' into staging

diff --cc Config.mk
index 82b0c7c2274335a9f3e38ced2a16eed771f09dc8,e85bf186547fec4e284cc702441c4a681d68f6fd..e7af4a402dc031e7870c4a87974935fb86e81fc2
--- 1/Config.mk
--- 2/Config.mk
+++ b/Config.mk
@@@ -244,9 -244,9 +244,9 @@@ QEMU_TRADITIONAL_URL ?= git://xenbits.x
  SEABIOS_UPSTREAM_URL ?= git://xenbits.xen.org/seabios.git
  MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git
  endif
 -OVMF_UPSTREAM_REVISION ?= b37cfdd2807181aed2fee1e17bd7ec1190db266a
 +OVMF_UPSTREAM_REVISION ?= 7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5
  QEMU_UPSTREAM_REVISION ?= master
- MINIOS_UPSTREAM_REVISION ?= 051b87bb9c19609976fb038f386920e1ce5454c5
+ MINIOS_UPSTREAM_REVISION ?= 9f09744aa3e5982a083ecf8e9cd2123f477081f9
  
  SEABIOS_UPSTREAM_REVISION ?= rel-1.14.0